Consistently private headers
authorMatthias Clasen <mclasen@redhat.com>
Thu, 9 Feb 2012 00:36:10 +0000 (19:36 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 14 Feb 2012 21:36:58 +0000 (16:36 -0500)
Add a 'private' suffix to all newly introduced private
headers.

15 files changed:
gtk/Makefile.am
gtk/gtkcolorchooserwidget.c
gtk/gtkcoloreditor.c
gtk/gtkcoloreditor.h [deleted file]
gtk/gtkcoloreditorprivate.h [new file with mode: 0644]
gtk/gtkcolorplane.c
gtk/gtkcolorplane.h [deleted file]
gtk/gtkcolorplaneprivate.h [new file with mode: 0644]
gtk/gtkcolorscale.c
gtk/gtkcolorscale.h [deleted file]
gtk/gtkcolorscaleprivate.h [new file with mode: 0644]
gtk/gtkcolorswatch.c
gtk/gtkcolorswatch.h [deleted file]
gtk/gtkcolorswatchprivate.h [new file with mode: 0644]
gtk/gtkrange.c

index 6ae0347b6f7193efe1c1635b665c034f49f41667..75160f3982fb594d7db15d7070b5501fa10f5b3e 100644 (file)
@@ -414,10 +414,10 @@ gtk_private_h_sources =           \
        gtkbuilderprivate.h     \
        gtkbuttonprivate.h      \
        gtkcellareaboxcontextprivate.h  \
-       gtkcolorswatch.h        \
-       gtkcoloreditor.h        \
-       gtkcolorplane.h         \
-       gtkcolorscale.h         \
+       gtkcolorswatchprivate.h \
+       gtkcoloreditorprivate.h \
+       gtkcolorplaneprivate.h  \
+       gtkcolorscaleprivate.h  \
        gtkcolorchooserprivate.h        \
        gtkcontainerprivate.h   \
        gtkcsscomputedvaluesprivate.h \
index 117ddb8a00d4b4ec0b6f57dd3e5bbb973d12c923..10d29c27c33318b12d4af92997326613182a3c8f 100644 (file)
@@ -22,8 +22,8 @@
 
 #include "gtkcolorchooserprivate.h"
 #include "gtkcolorchooserwidget.h"
-#include "gtkcoloreditor.h"
-#include "gtkcolorswatch.h"
+#include "gtkcoloreditorprivate.h"
+#include "gtkcolorswatchprivate.h"
 #include "gtkbox.h"
 #include "gtkgrid.h"
 #include "gtklabel.h"
index 404b2b37c646e5e3fe3ae6f334cd5da6d0bf97df..8019d41768b85163a038679f72326652998a726d 100644 (file)
 
 #include "config.h"
 
-#include "gtkcoloreditor.h"
+#include "gtkcoloreditorprivate.h"
 
 #include "gtkcolorchooserprivate.h"
-#include "gtkcolorplane.h"
-#include "gtkcolorscale.h"
-#include "gtkcolorswatch.h"
+#include "gtkcolorplaneprivate.h"
+#include "gtkcolorscaleprivate.h"
+#include "gtkcolorswatchprivate.h"
 #include "gtkcolorutils.h"
 #include "gtkgrid.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkcoloreditor.h b/gtk/gtkcoloreditor.h
deleted file mode 100644 (file)
index b8ee219..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#ifndef __GTK_COLOR_EDITOR_H__
-#define __GTK_COLOR_EDITOR_H__
-
-#include <gtk/gtkbox.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_EDITOR            (gtk_color_editor_get_type ())
-#define GTK_COLOR_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_EDITOR, GtkColorEditor))
-#define GTK_COLOR_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_EDITOR, GtkColorEditorClass))
-#define GTK_IS_COLOR_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_EDITOR))
-#define GTK_IS_COLOR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_EDITOR))
-#define GTK_COLOR_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_EDITOR, GtkColorEditorClass))
-
-
-typedef struct _GtkColorEditor         GtkColorEditor;
-typedef struct _GtkColorEditorClass    GtkColorEditorClass;
-typedef struct _GtkColorEditorPrivate  GtkColorEditorPrivate;
-
-struct _GtkColorEditor
-{
-  GtkBox parent_instance;
-
-  GtkColorEditorPrivate *priv;
-};
-
-struct _GtkColorEditorClass
-{
-  GtkBoxClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-G_GNUC_INTERNAL
-GType       gtk_color_editor_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_color_editor_new      (void);
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_EDITOR_H__ */
diff --git a/gtk/gtkcoloreditorprivate.h b/gtk/gtkcoloreditorprivate.h
new file mode 100644 (file)
index 0000000..b8ee219
--- /dev/null
@@ -0,0 +1,70 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_COLOR_EDITOR_H__
+#define __GTK_COLOR_EDITOR_H__
+
+#include <gtk/gtkbox.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COLOR_EDITOR            (gtk_color_editor_get_type ())
+#define GTK_COLOR_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_EDITOR, GtkColorEditor))
+#define GTK_COLOR_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_EDITOR, GtkColorEditorClass))
+#define GTK_IS_COLOR_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_EDITOR))
+#define GTK_IS_COLOR_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_EDITOR))
+#define GTK_COLOR_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_EDITOR, GtkColorEditorClass))
+
+
+typedef struct _GtkColorEditor         GtkColorEditor;
+typedef struct _GtkColorEditorClass    GtkColorEditorClass;
+typedef struct _GtkColorEditorPrivate  GtkColorEditorPrivate;
+
+struct _GtkColorEditor
+{
+  GtkBox parent_instance;
+
+  GtkColorEditorPrivate *priv;
+};
+
+struct _GtkColorEditorClass
+{
+  GtkBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+
+G_GNUC_INTERNAL
+GType       gtk_color_editor_get_type (void) G_GNUC_CONST;
+
+G_GNUC_INTERNAL
+GtkWidget * gtk_color_editor_new      (void);
+
+G_END_DECLS
+
+#endif /* __GTK_COLOR_EDITOR_H__ */
index ab50610c46001ec2030895c2ebf568b3cd78ce03..a34b7fad33e647f9844f9189d415de7ee374e2d6 100644 (file)
@@ -19,7 +19,8 @@
 
 #include "config.h"
 
-#include "gtkcolorplane.h"
+#include "gtkcolorplaneprivate.h"
+
 #include "gtkcolorutils.h"
 #include "gtkaccessible.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkcolorplane.h b/gtk/gtkcolorplane.h
deleted file mode 100644 (file)
index 9bf22ca..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#ifndef __GTK_COLOR_PLANE_H__
-#define __GTK_COLOR_PLANE_H__
-
-#include <gtk/gtkdrawingarea.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_PLANE            (gtk_color_plane_get_type ())
-#define GTK_COLOR_PLANE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_PLANE, GtkColorPlane))
-#define GTK_COLOR_PLANE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_PLANE, GtkColorPlaneClass))
-#define GTK_IS_COLOR_PLANE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_PLANE))
-#define GTK_IS_COLOR_PLANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_PLANE))
-#define GTK_COLOR_PLANE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_PLANE, GtkColorPlaneClass))
-
-
-typedef struct _GtkColorPlane         GtkColorPlane;
-typedef struct _GtkColorPlaneClass    GtkColorPlaneClass;
-typedef struct _GtkColorPlanePrivate  GtkColorPlanePrivate;
-
-struct _GtkColorPlane
-{
-  GtkDrawingArea parent_instance;
-
-  GtkColorPlanePrivate *priv;
-};
-
-struct _GtkColorPlaneClass
-{
-  GtkDrawingAreaClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-G_GNUC_INTERNAL
-GType       gtk_color_plane_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_color_plane_new      (GtkAdjustment *h_adj,
-                                      GtkAdjustment *s_adj,
-                                      GtkAdjustment *v_adj);
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_PLANE_H__ */
diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
new file mode 100644 (file)
index 0000000..9bf22ca
--- /dev/null
@@ -0,0 +1,72 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_COLOR_PLANE_H__
+#define __GTK_COLOR_PLANE_H__
+
+#include <gtk/gtkdrawingarea.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COLOR_PLANE            (gtk_color_plane_get_type ())
+#define GTK_COLOR_PLANE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_PLANE, GtkColorPlane))
+#define GTK_COLOR_PLANE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_PLANE, GtkColorPlaneClass))
+#define GTK_IS_COLOR_PLANE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_PLANE))
+#define GTK_IS_COLOR_PLANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_PLANE))
+#define GTK_COLOR_PLANE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_PLANE, GtkColorPlaneClass))
+
+
+typedef struct _GtkColorPlane         GtkColorPlane;
+typedef struct _GtkColorPlaneClass    GtkColorPlaneClass;
+typedef struct _GtkColorPlanePrivate  GtkColorPlanePrivate;
+
+struct _GtkColorPlane
+{
+  GtkDrawingArea parent_instance;
+
+  GtkColorPlanePrivate *priv;
+};
+
+struct _GtkColorPlaneClass
+{
+  GtkDrawingAreaClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+
+G_GNUC_INTERNAL
+GType       gtk_color_plane_get_type (void) G_GNUC_CONST;
+
+G_GNUC_INTERNAL
+GtkWidget * gtk_color_plane_new      (GtkAdjustment *h_adj,
+                                      GtkAdjustment *s_adj,
+                                      GtkAdjustment *v_adj);
+
+G_END_DECLS
+
+#endif /* __GTK_COLOR_PLANE_H__ */
index c1cc6605ac0fc4bc500506c12ea23c425412b1f6..455590938b104d4ea449291bc7192ead519b677f 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkcolorscale.h"
+#include "gtkcolorscaleprivate.h"
 
 #include "gtkcolorutils.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtkcolorscale.h b/gtk/gtkcolorscale.h
deleted file mode 100644 (file)
index acb5888..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#ifndef __GTK_COLOR_SCALE_H__
-#define __GTK_COLOR_SCALE_H__
-
-#include <gtk/gtkscale.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SCALE            (gtk_color_scale_get_type ())
-#define GTK_COLOR_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SCALE, GtkColorScale))
-#define GTK_COLOR_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SCALE, GtkColorScaleClass))
-#define GTK_IS_COLOR_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SCALE))
-#define GTK_IS_COLOR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SCALE))
-#define GTK_COLOR_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SCALE, GtkColorScaleClass))
-
-
-typedef struct _GtkColorScale         GtkColorScale;
-typedef struct _GtkColorScaleClass    GtkColorScaleClass;
-typedef struct _GtkColorScalePrivate  GtkColorScalePrivate;
-
-struct _GtkColorScale
-{
-  GtkScale parent_instance;
-
-  GtkColorScalePrivate *priv;
-};
-
-struct _GtkColorScaleClass
-{
-  GtkScaleClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-typedef enum
-{
-  GTK_COLOR_SCALE_HUE,
-  GTK_COLOR_SCALE_ALPHA
-} GtkColorScaleType;
-
-G_GNUC_INTERNAL
-GType       gtk_color_scale_get_type (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_color_scale_new      (GtkAdjustment     *adjustment,
-                                      GtkColorScaleType  type);
-
-G_GNUC_INTERNAL
-void        gtk_color_scale_set_rgba (GtkColorScale     *scale,
-                                      const GdkRGBA     *color);
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SCALE_H__ */
diff --git a/gtk/gtkcolorscaleprivate.h b/gtk/gtkcolorscaleprivate.h
new file mode 100644 (file)
index 0000000..acb5888
--- /dev/null
@@ -0,0 +1,80 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_COLOR_SCALE_H__
+#define __GTK_COLOR_SCALE_H__
+
+#include <gtk/gtkscale.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COLOR_SCALE            (gtk_color_scale_get_type ())
+#define GTK_COLOR_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SCALE, GtkColorScale))
+#define GTK_COLOR_SCALE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SCALE, GtkColorScaleClass))
+#define GTK_IS_COLOR_SCALE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SCALE))
+#define GTK_IS_COLOR_SCALE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SCALE))
+#define GTK_COLOR_SCALE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SCALE, GtkColorScaleClass))
+
+
+typedef struct _GtkColorScale         GtkColorScale;
+typedef struct _GtkColorScaleClass    GtkColorScaleClass;
+typedef struct _GtkColorScalePrivate  GtkColorScalePrivate;
+
+struct _GtkColorScale
+{
+  GtkScale parent_instance;
+
+  GtkColorScalePrivate *priv;
+};
+
+struct _GtkColorScaleClass
+{
+  GtkScaleClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+typedef enum
+{
+  GTK_COLOR_SCALE_HUE,
+  GTK_COLOR_SCALE_ALPHA
+} GtkColorScaleType;
+
+G_GNUC_INTERNAL
+GType       gtk_color_scale_get_type (void) G_GNUC_CONST;
+
+G_GNUC_INTERNAL
+GtkWidget * gtk_color_scale_new      (GtkAdjustment     *adjustment,
+                                      GtkColorScaleType  type);
+
+G_GNUC_INTERNAL
+void        gtk_color_scale_set_rgba (GtkColorScale     *scale,
+                                      const GdkRGBA     *color);
+
+G_END_DECLS
+
+#endif /* __GTK_COLOR_SCALE_H__ */
index fd5f6a8b234f93f10c522d49789bf869cef63f80..ddc78c5e0597a5d3d9105b5c26f5509cc13b873c 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkcolorswatch.h"
+#include "gtkcolorswatchprivate.h"
 
 #include "gtkroundedboxprivate.h"
 #include "gtkthemingbackgroundprivate.h"
diff --git a/gtk/gtkcolorswatch.h b/gtk/gtkcolorswatch.h
deleted file mode 100644 (file)
index 71bcd1a..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#ifndef __GTK_COLOR_SWATCH_H__
-#define __GTK_COLOR_SWATCH_H__
-
-#include <gtk/gtkdrawingarea.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_COLOR_SWATCH                  (gtk_color_swatch_get_type ())
-#define GTK_COLOR_SWATCH(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SWATCH, GtkColorSwatch))
-#define GTK_COLOR_SWATCH_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SWATCH, GtkColorSwatchClass))
-#define GTK_IS_COLOR_SWATCH(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SWATCH))
-#define GTK_IS_COLOR_SWATCH_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SWATCH))
-#define GTK_COLOR_SWATCH_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SWATCH, GtkColorSwatchClass))
-
-
-typedef struct _GtkColorSwatch        GtkColorSwatch;
-typedef struct _GtkColorSwatchClass   GtkColorSwatchClass;
-typedef struct _GtkColorSwatchPrivate GtkColorSwatchPrivate;
-
-struct _GtkColorSwatch
-{
-  GtkDrawingArea parent;
-
-  /*< private >*/
-  GtkColorSwatchPrivate *priv;
-};
-
-struct _GtkColorSwatchClass
-{
-  GtkDrawingAreaClass parent_class;
-
-  void ( * activate)  (GtkColorSwatch *swatch);
-  void ( * customize) (GtkColorSwatch *swatch);
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-G_GNUC_INTERNAL
-GType       gtk_color_swatch_get_type         (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GtkWidget * gtk_color_swatch_new              (void);
-
-G_GNUC_INTERNAL
-void        gtk_color_swatch_set_rgba         (GtkColorSwatch *swatch,
-                                               const GdkRGBA  *color);
-G_GNUC_INTERNAL
-gboolean    gtk_color_swatch_get_rgba         (GtkColorSwatch *swatch,
-                                               GdkRGBA        *color);
-G_GNUC_INTERNAL
-void        gtk_color_swatch_set_hsva         (GtkColorSwatch *swatch,
-                                               gdouble         h,
-                                               gdouble         s,
-                                               gdouble         v,
-                                               gdouble         a);
-G_GNUC_INTERNAL
-void        gtk_color_swatch_set_selected     (GtkColorSwatch *swatch,
-                                               gboolean        selected);
-G_GNUC_INTERNAL
-void        gtk_color_swatch_set_can_drop     (GtkColorSwatch *swatch,
-                                               gboolean        can_drop);
-G_GNUC_INTERNAL
-void        gtk_color_swatch_set_icon         (GtkColorSwatch *swatch,
-                                               const gchar    *icon);
-G_GNUC_INTERNAL
-void        gtk_color_swatch_set_use_alpha    (GtkColorSwatch *swatch,
-                                               gboolean        use_alpha);
-
-
-G_END_DECLS
-
-#endif /* __GTK_COLOR_SWATCH_H__ */
diff --git a/gtk/gtkcolorswatchprivate.h b/gtk/gtkcolorswatchprivate.h
new file mode 100644 (file)
index 0000000..71bcd1a
--- /dev/null
@@ -0,0 +1,100 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2012 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#ifndef __GTK_COLOR_SWATCH_H__
+#define __GTK_COLOR_SWATCH_H__
+
+#include <gtk/gtkdrawingarea.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_COLOR_SWATCH                  (gtk_color_swatch_get_type ())
+#define GTK_COLOR_SWATCH(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SWATCH, GtkColorSwatch))
+#define GTK_COLOR_SWATCH_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_COLOR_SWATCH, GtkColorSwatchClass))
+#define GTK_IS_COLOR_SWATCH(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_SWATCH))
+#define GTK_IS_COLOR_SWATCH_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_SWATCH))
+#define GTK_COLOR_SWATCH_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_COLOR_SWATCH, GtkColorSwatchClass))
+
+
+typedef struct _GtkColorSwatch        GtkColorSwatch;
+typedef struct _GtkColorSwatchClass   GtkColorSwatchClass;
+typedef struct _GtkColorSwatchPrivate GtkColorSwatchPrivate;
+
+struct _GtkColorSwatch
+{
+  GtkDrawingArea parent;
+
+  /*< private >*/
+  GtkColorSwatchPrivate *priv;
+};
+
+struct _GtkColorSwatchClass
+{
+  GtkDrawingAreaClass parent_class;
+
+  void ( * activate)  (GtkColorSwatch *swatch);
+  void ( * customize) (GtkColorSwatch *swatch);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+
+G_GNUC_INTERNAL
+GType       gtk_color_swatch_get_type         (void) G_GNUC_CONST;
+
+G_GNUC_INTERNAL
+GtkWidget * gtk_color_swatch_new              (void);
+
+G_GNUC_INTERNAL
+void        gtk_color_swatch_set_rgba         (GtkColorSwatch *swatch,
+                                               const GdkRGBA  *color);
+G_GNUC_INTERNAL
+gboolean    gtk_color_swatch_get_rgba         (GtkColorSwatch *swatch,
+                                               GdkRGBA        *color);
+G_GNUC_INTERNAL
+void        gtk_color_swatch_set_hsva         (GtkColorSwatch *swatch,
+                                               gdouble         h,
+                                               gdouble         s,
+                                               gdouble         v,
+                                               gdouble         a);
+G_GNUC_INTERNAL
+void        gtk_color_swatch_set_selected     (GtkColorSwatch *swatch,
+                                               gboolean        selected);
+G_GNUC_INTERNAL
+void        gtk_color_swatch_set_can_drop     (GtkColorSwatch *swatch,
+                                               gboolean        can_drop);
+G_GNUC_INTERNAL
+void        gtk_color_swatch_set_icon         (GtkColorSwatch *swatch,
+                                               const gchar    *icon);
+G_GNUC_INTERNAL
+void        gtk_color_swatch_set_use_alpha    (GtkColorSwatch *swatch,
+                                               gboolean        use_alpha);
+
+
+G_END_DECLS
+
+#endif /* __GTK_COLOR_SWATCH_H__ */
index 14c72f9d2a46664cb5b60f46a96384209464f389..0d32f0bb02af1d3bb997c76b39badbbf453491ad 100644 (file)
@@ -35,7 +35,7 @@
 #include "gtkorientableprivate.h"
 #include "gtkrange.h"
 #include "gtkscale.h"
-#include "gtkcolorscale.h"
+#include "gtkcolorscaleprivate.h"
 #include "gtkscrollbar.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"